From b92a3ca11f264258cafb4c4061e135c7e547daad Mon Sep 17 00:00:00 2001
From: "emellor@ewan" <emellor@ewan>
Date: Sat, 17 Sep 2005 16:10:04 +0100
Subject: [PATCH] Added getTargetMemory, getSsidref methods to XendDomainInfo,
 and use these and getDomain, getName in SrvDomainDir, to decouple the latter
 from the internals of the former, in preparation for changes internal to
 XendDomainInfo.

Signed-off-by: Ewan Mellor<ewan@xensource.com>
---
 tools/python/xen/xend/XendDomainInfo.py      |  7 +++++++
 tools/python/xen/xend/server/SrvDomainDir.py | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 0110462a49..36e93472df 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -334,6 +334,13 @@ class XendDomainInfo:
     def getName(self):
         return self.name
 
+    def getSsidref(self):
+        return self.ssidref
+
+    def getTargetMemory(self):
+        """Get this domain's target memory size, in MiB."""
+        return self.memory
+
     def setStoreRef(self, ref):
         self.store_mfn = ref
         self.storeDom("store/ring-ref", ref)
diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py
index 78066b2f40..c9593aaee6 100644
--- a/tools/python/xen/xend/server/SrvDomainDir.py
+++ b/tools/python/xen/xend/server/SrvDomainDir.py
@@ -85,7 +85,7 @@ class SrvDomainDir(SrvDir):
     def _op_create_cb(self, dominfo, configstring, req):
         """Callback to handle domain creation.
         """
-        dom = dominfo.name
+        dom = dominfo.getName()
         domurl = "%s/%s" % (req.prePathURL(), dom)
         req.setResponseCode(http.CREATED, "created")
         req.setHeader("Location", domurl)
@@ -112,7 +112,7 @@ class SrvDomainDir(SrvDir):
         fn = FormFn(self.xd.domain_restore,
                     [['file', 'str']])
         dominfo = fn(req.args)
-        dom = dominfo.name
+        dom = dominfo.getName()
         domurl = "%s/%s" % (req.prePathURL(), dom)
         req.setResponseCode(http.CREATED)
         req.setHeader("Location", domurl)
@@ -153,10 +153,10 @@ class SrvDomainDir(SrvDir):
             req.write('<ul>')
             for d in domains:
                req.write('<li><a href="%s%s"> Domain %s</a>'
-                         % (url, d.name, d.name))
-               req.write('id=%s' % d.domid)
-               req.write('memory=%d'% d.memory)
-               req.write('ssidref=%d'% d.ssidref)
+                         % (url, d.getName(), d.getName()))
+               req.write('id=%s' % d.getDomain())
+               req.write('memory=%d'% d.getTargetMemory())
+               req.write('ssidref=%d'% d.getSsidref())
                req.write('</li>')
             req.write('</ul>')
 
-- 
2.30.2